am e0c8330a: am e66f8717: (-s ours) am 913cd98d: am e715ac6c: Merge "Removed checks for null that introduced bug." into studio-1.4-dev automerge: a58b9f6 automerge: 82178ea * commit 'e0c8330afa4dfd599f3ab8cd95d45b63068ece9e':